Merge branch 'staging' of ssh://xenbits.xen.org/home/xen/git/xen into staging
authorIan Campbell <ian.campbell@citrix.com>
Fri, 3 Jul 2015 15:33:45 +0000 (16:33 +0100)
committerIan Campbell <ian.campbell@citrix.com>
Fri, 3 Jul 2015 15:33:45 +0000 (16:33 +0100)
commit9ba66fc82e9bfff350d8ad92d918787dd10cad40
tree73e94954f8aceec9d47e3e6f030b6c566663a719
parent186d39b89ada623da01b9f58e4b8869cfe7a7ac1
parentd26cf404befff4f39ad095d6b03759c807b2b1fe
Merge branch 'staging' of ssh://xenbits.xen.org/home/xen/git/xen into staging